@@ -4,7 +4,7 @@ import monetary  | 
            ||
| 4 | 4 | 
                from django.conf import settings  | 
            
| 5 | 5 | 
                from django.contrib import admin  | 
            
| 6 | 6 | 
                from django.contrib.auth.hashers import make_password  | 
            
| 7 | 
                -from django_admin import AdvancedActionsModelAdmin, AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin  | 
            |
| 7 | 
                +from django_admin import AdvancedActionsModelAdmin, AdvancedExportExcelModelAdmin, DeleteModelAdmin, ReadOnlyModelAdmin  | 
            |
| 8 | 8 | 
                from django_models_ext import ProvinceShortModelMixin  | 
            
| 9 | 9 | 
                from pysnippets.strsnippets import strip  | 
            
| 10 | 10 | 
                 | 
            
                @@ -63,7 +63,7 @@ class BrandInfoAdmin(admin.ModelAdmin):  | 
            ||
| 63 | 63 | 
                OperatorInfo.objects.filter(brand_id=obj.brand_id).update(brand_domain=obj.brand_domain)  | 
            
| 64 | 64 | 
                 | 
            
| 65 | 65 | 
                 | 
            
| 66 | 
                -class ModelInfoAdmin(admin.ModelAdmin):  | 
            |
| 66 | 
                +class ModelInfoAdmin(DeleteModelAdmin, admin.ModelAdmin):  | 
            |
| 67 | 67 | 
                     list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'image2', 'factory_yuan', 'integral', 'position', 'display', 'status', 'created_at', 'updated_at')
               | 
            
| 68 | 68 | 
                     list_filter = ('brand_name', 'category', 'warehouse', 'shot_type_id', 'display', 'status')
               | 
            
| 69 | 69 | 
                     readonly_fields = ('brand_name', 'factory_fee')
               | 
            
                @@ -1,6 +1,7 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 3 | 
                from django.contrib import admin  | 
            
| 4 | 
                +from django_admin import DeleteModelAdmin  | 
            |
| 4 | 5 | 
                 | 
            
| 5 | 6 | 
                from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityInfo, MemberActivitySigninInfo,  | 
            
| 6 | 7 | 
                MemberActivitySignupInfo, RightInfo, ShotTypeInfo)  | 
            
                @@ -32,7 +33,7 @@ class RightInfoAdmin(admin.ModelAdmin):  | 
            ||
| 32 | 33 | 
                     list_filter = ('right_type', 'is_send_coupon', 'status')
               | 
            
| 33 | 34 | 
                 | 
            
| 34 | 35 | 
                 | 
            
| 35 | 
                -class ShotTypeInfoAdmin(admin.ModelAdmin):  | 
            |
| 36 | 
                +class ShotTypeInfoAdmin(DeleteModelAdmin, admin.ModelAdmin):  | 
            |
| 36 | 37 | 
                     list_display = ('shot_type_id', 'shot_type_name', 'position', 'status', 'created_at', 'updated_at')
               | 
            
| 37 | 38 | 
                 | 
            
| 38 | 39 | 
                def save_model(self, request, obj, form, change):  | 
            
                @@ -2,7 +2,7 @@ Django==1.11.26  | 
            ||
| 2 | 2 | 
                django-admin==2.0.0  | 
            
| 3 | 3 | 
                django-cors-headers==3.0.2  | 
            
| 4 | 4 | 
                django-curtail-uuid==1.0.4  | 
            
| 5 | 
                -django-detect==1.0.16  | 
            |
| 5 | 
                +django-detect==1.0.17  | 
            |
| 6 | 6 | 
                django-file-md5==1.0.3  | 
            
| 7 | 7 | 
                django-file-upload==1.1.1  | 
            
| 8 | 8 | 
                django-ip==1.0.2  |